Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205#36

Merged
mssonicbld merged 13 commits intoAzure:202205from
mssonicbld:sonicbld/202205-merge
Jun 16, 2023
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205#36
mssonicbld merged 13 commits intoAzure:202205from
mssonicbld:sonicbld/202205-merge

Conversation

@mssonicbld
Copy link
Copy Markdown
Collaborator

* 3396cca1a - (head/202205) [Arista] fix platform.json for a few devices (#15308) (2023-06-16) [Samuel Angebault]
* 89b7f4648 - [Marvell] Update armhf driver version (#15138) (2023-06-16) [pavannaregundi]
* 340a6f68a - [celestica/e1031]: enable emc2305 fan controller timeout feature (#14401) (2023-06-16) [Ikki Zhu]
* 417196f80 - [202205][YANG] add model for `MUX_CABLE` and `PEER_SWITCH` (#15485) (2023-06-15) [Jing Zhang]
* 3c8350c7c - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#15470) (2023-06-15) [mssonicbld]
* 821c883ef - [yang] Change asn to start from 0 for bgp monitor (#15350) (#15482) (2023-06-16) [mssonicbld]
* c4fcd31fa - enable ethernet backplane port support in port config for packet mode T2 devices (#14533) (#15479) (2023-06-16) [mssonicbld]
* 913f466cb - [ci] Add OVERRIDE_BUILD_OPTIONS in image build template. (#15309) (#15481) (2023-06-16) [mssonicbld]
* 7ce21a6db - [healthd] Use unix_socket_path instead of loopback ip (#14843) (#15480) (2023-06-16) [mssonicbld]
* 77d42df16 - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#15455) (2023-06-15) [mssonicbld]
* a1ee45d7d - Update cisco-8000.ini (#15465) (2023-06-15) [James An]
* 40ef03e70 - allow docker_inram to kernel cmd list (#15374) (2023-06-15) [Liping Xu]<br>```

lipxu and others added 13 commits June 15, 2023 14:33
Why I did it
After docker_inram is enabled, the docker folder's default max size is 1.5G.
It's not big enough for some tests which need to install additional docker images or install extra packages.

Work item tracking
Microsoft ADO 24199761:
How I did it
add docker_inram into cmdline_allowlist

How to verify it
sudo sh -c 'echo "docker_inram_size=3000M" >> kernel-cmdline-append'
sudo reboot and check the docker folder size
Why I did it

Release Notes for Cisco 8101-32FH-O:
• Fixed a FEC lane related error message
• Implemented 'show platform npu mac-state -i ' CLI for NPU MAC information and save-state dump.
• Fixed a Mac Port SerDes credit mismatch error message
• Configurable drop counter support for SAI_DEBUG_COUNTER_ATTR_TYPE (MIGSMSFT-197)
• Removed eth1-midplane creation rule that is not needed for this platform.
• Fix to move control packets from queue 0 to queue 7

How I did it

Update platform version to 202205.2.2.5
…atically (#15455)

src/sonic-utilities

* 24d0d1cb - (HEAD -> 202205, origin/202205) Update portstat (#2877) (26 hours ago) [wenyiz2021]
…lly (#15470)

src/sonic-swss

* 6a193e0 - (HEAD -> 202205, origin/202205) [Dual-ToR][ACL] bind LAG to ACL table in order to guarantee rule coverage if lag menber will be added to LAG after binding (#2749) (5 hours ago) [Andriy Yurkiv]
* [YANG] Add MUX_CABLE yang model  (#11797)

Why I did it
Address issue #10970

sign-off: Jing Zhang zhangjing@microsoft.com

How I did it
Add sonic-mux-cable.yang and unit tests.

How to verify it
Compile Compile target/python-wheels/sonic_yang_mgmt-1.0-py3-none-any.whl and target/python-wheels/sonic_yang_models-1.0-py3-none-any.whl.
Pass sonic-config-engine unit test.
Which release branch to backport (provide reason below if selected)
 201811
 201911
 202006
 202012
 202106
 202111
 202205
Description for the changelog
Link to config_db schema for YANG module changes
https://github.com/sonic-net/sonic-buildimage/blob/f8fe41a0238b8a7b9e32ae42262f41b63050c55f/src/sonic-yang-models/doc/Configuration.md#mux_cable

* [YANG] add peer switch model (#11828)

Why I did it
Address issue #10966

sign-off: Jing Zhang zhangjing@microsoft.com

How I did it
Add sonic-peer-switch.yang and unit tests.

How to verify it
Compile Compile target/python-wheels/sonic_yang_mgmt-1.0-py3-none-any.whl and target/python-wheels/sonic_yang_models-1.0-py3-none-any.whl.

Which release branch to backport (provide reason below if selected)
 201811
 201911
 202006
 202012
 202106
 202111
 202205
Description for the changelog
Link to config_db schema for YANG module changes
https://github.com/sonic-net/sonic-buildimage/blob/b721ff87b976a6a38bdd65443ea3bc686014e783/src/sonic-yang-models/doc/Configuration.md#peer-switch
…401)

Why I did it
There is rare condition, emc2305 hold SMBus and cause SMBus completion wait timed out.

How I did it
Enable EMC2305 SMBus timeout feature, 30ms period of inactivity will reset the interface.

How to verify it
Use 'i2cget -y -f 23 0x4d 0x20 b' to read EMC2305 configuration register and check DIS_TO bit not set.

Signed-off-by: Eric Zhu <erzhu@celestica.com>
Changes in MRVL_PRESTERA_DRIVER_1.4:
- Memory leak fixed by releasing pci device after retrieval.
- Fixes for 5.10 kernel porting.

Change-Id: I1d7ee4ec02ec17a29ddb8473725ab68ca399748b

Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com>
Why I did it
sonic-mgmt is failing tests due to invalid test data in platform.json
Fwutil is upset the chassis name in the platform_component.json of the 7060CX-32S

How I did it
Fixed the aforementioned issues
@mssonicbld mssonicbld requested review from a team, lguohan and qiluo-msft as code owners June 16, 2023 03:01
@mssonicbld mssonicbld merged commit 95cee7f into Azure:202205 Jun 16, 2023
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request May 3, 2024
…tomatically (#18665)

#### Why I did it
src/sonic-platform-pde
```
* 8b44c3c - (HEAD -> master, origin/master, origin/HEAD) Merge pull request Azure#36 from sg893052/PL_PDE_BOOKWORM_MIGRATION (27 hours ago) [賓少鈺]
* 9f7ac0f - PDE Migration to bookworm (2 weeks ago) [sg893052]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Feb 18, 2025
…lly (#634)

#### Why I did it
src/sonic-swss
```
* b2a7b03 - (HEAD -> 202412, origin/202412) [code sync] Merge code from sonic-net/sonic-swss:202411 to 202412 (#36) (7 hours ago) [mssonicbld]
* 84485cd - [code sync] Merge code from sonic-net/sonic-swss:202411 to 202412 (#35) (31 hours ago) [mssonicbld]
* 6e83557 - [code sync] Merge code from sonic-net/sonic-swss:202411 to 202412 (#34) (2 days ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Feb 24, 2025
… automatically (#687)

#### Why I did it
src/sonic-platform-common
```
* f406f3a - (HEAD -> 202412, origin/202412) [code sync] Merge code from sonic-net/sonic-platform-common:202411 to 202412 (#36) (21 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Mar 14, 2025
…tomatically (#877)

#### Why I did it
src/sonic-linux-kernel
```
* cdbd77b - (HEAD -> 202412, origin/HEAD, origin/202412) [code sync] Merge code from sonic-net/sonic-linux-kernel:202411 to 202412 (#36) (21 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Mar 16, 2025
…omatically (#900)

#### Why I did it
src/sonic-swss-common
```
* b700027 - (HEAD -> 202412, origin/HEAD, origin/202412) [FC] remove FLEX_COUNTER_DELAY_STATUS_FIELD (#982) (#36) (20 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
r12f pushed a commit that referenced this pull request Apr 2, 2025
…D automatically (#964)

#### Why I did it
src/sonic-sairedis
```
* 80da97d - (HEAD -> 202412, origin/HEAD, origin/202412) Merge pull request #36 from Pterosaur/update_sai (21 hours ago) [Ze Gan]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Apr 11, 2025
…D automatically (#969)

#### Why I did it
src/sonic-sairedis
```
* 80da97d - (HEAD -> 202412, origin/HEAD, origin/202412) Merge pull request #36 from Pterosaur/update_sai (2 days ago) [Ze Gan]
```
#### How I did it
#### How to verify it
#### Description for the changelog
prabhataravind pushed a commit that referenced this pull request Jul 7, 2025
… (#22075)

#### Why I did it
src/dhcpmon
```
* 7b82a9d - (HEAD -> master, origin/master, origin/HEAD) Add support for per-interface counter (#36) (4 days ago) [Yaqiang Zhu]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants